diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 9822d7d..aeb649e 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -90,8 +90,8 @@
 #define CFG_I2C_EEPROM_ADDR	0x50
 #define CFG_I2C_EEPROM_ADDR_LEN	2
 #define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
-#define CFG_ENV_OFFSET		0x000	/* environment starts at offset 0 */
-#define CFG_ENV_SIZE		0x800	/* 2KB should be more than enough */
+#define CONFIG_ENV_OFFSET		0x000	/* environment starts at offset 0 */
+#define CONFIG_ENV_SIZE		0x800	/* 2KB should be more than enough */
 
 #undef CFG_I2C_EEPROM_ADDR_OVERFLOW
 #define CFG_EEPROM_PAGE_WRITE_BITS 6	/* 64 bytes page write mode on 24C256 */
@@ -100,7 +100,7 @@
 /*
  * Size of malloc() pool
  */
-/*#define CONFIG_MALLOC_SIZE	(CFG_ENV_SIZE + 128*1024)*/
+/*#define CONFIG_MALLOC_SIZE	(CONFIG_ENV_SIZE + 128*1024)*/
 #define CFG_GBL_DATA_SIZE	128		/* size in bytes reserved for initial data */
 
 #define CFG_MONITOR_LEN		(256 * 1024)
@@ -226,12 +226,12 @@
 #ifdef CONFIG_AMD_LV800
 #define PHYS_FLASH_SIZE		0x00100000 /* 1MB */
 #define CFG_MAX_FLASH_SECT	(19)	/* max number of sectors on one chip */
-#define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
+#define CONFIG_ENV_ADDR		(CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
 #endif
 #ifdef CONFIG_AMD_LV400
 #define PHYS_FLASH_SIZE		0x00080000 /* 512KB */
 #define CFG_MAX_FLASH_SECT	(11)	/* max number of sectors on one chip */
-#define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x070000) /* addr of environment */
+#define CONFIG_ENV_ADDR		(CFG_FLASH_BASE + 0x070000) /* addr of environment */
 #endif
 
 /* timeout values are in ticks */
@@ -240,7 +240,7 @@
 
 #if 0
 #define	CONFIG_ENV_IS_IN_FLASH	1
-#define CFG_ENV_SIZE		0x10000	/* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE		0x10000	/* Total Size of Environment Sector */
 #endif